Merge.
authorSteven Smith <ssmith@xensource.com>
Mon, 25 Sep 2006 08:27:46 +0000 (09:27 +0100)
committerSteven Smith <ssmith@xensource.com>
Mon, 25 Sep 2006 08:27:46 +0000 (09:27 +0100)

Trivial merge